From 1b1b2e82641acab26e1eb7445e21b49e97346180 Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Fri, 2 Nov 2001 17:18:01 +0000 Subject: [PATCH] remove extraneous gtk_label_clear_layout (label) Fri Nov 2 11:51:49 2001 Jonathan Blandford * gtk/gtklabel.c (gtk_label_select_region_index): remove extraneous gtk_label_clear_layout (label) --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtklabel.c | 6 ++++-- 8 files changed, 39 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8aae2e2e06..949db8d94d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Nov 2 11:51:49 2001 Jonathan Blandford + + * gtk/gtklabel.c (gtk_label_select_region_index): remove + extraneous gtk_label_clear_layout (label) + 2001-11-02 Sebastian Wilhelmi * tests/makefile.msc, gtk/makefile.msc.in: Removed diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 8aae2e2e06..949db8d94d 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Fri Nov 2 11:51:49 2001 Jonathan Blandford + + * gtk/gtklabel.c (gtk_label_select_region_index): remove + extraneous gtk_label_clear_layout (label) + 2001-11-02 Sebastian Wilhelmi * tests/makefile.msc, gtk/makefile.msc.in: Removed diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8aae2e2e06..949db8d94d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Fri Nov 2 11:51:49 2001 Jonathan Blandford + + * gtk/gtklabel.c (gtk_label_select_region_index): remove + extraneous gtk_label_clear_layout (label) + 2001-11-02 Sebastian Wilhelmi * tests/makefile.msc, gtk/makefile.msc.in: Removed diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 8aae2e2e06..949db8d94d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Fri Nov 2 11:51:49 2001 Jonathan Blandford + + * gtk/gtklabel.c (gtk_label_select_region_index): remove + extraneous gtk_label_clear_layout (label) + 2001-11-02 Sebastian Wilhelmi * tests/makefile.msc, gtk/makefile.msc.in: Removed diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 8aae2e2e06..949db8d94d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Fri Nov 2 11:51:49 2001 Jonathan Blandford + + * gtk/gtklabel.c (gtk_label_select_region_index): remove + extraneous gtk_label_clear_layout (label) + 2001-11-02 Sebastian Wilhelmi * tests/makefile.msc, gtk/makefile.msc.in: Removed diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8aae2e2e06..949db8d94d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Fri Nov 2 11:51:49 2001 Jonathan Blandford + + * gtk/gtklabel.c (gtk_label_select_region_index): remove + extraneous gtk_label_clear_layout (label) + 2001-11-02 Sebastian Wilhelmi * tests/makefile.msc, gtk/makefile.msc.in: Removed diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8aae2e2e06..949db8d94d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Fri Nov 2 11:51:49 2001 Jonathan Blandford + + * gtk/gtklabel.c (gtk_label_select_region_index): remove + extraneous gtk_label_clear_layout (label) + 2001-11-02 Sebastian Wilhelmi * tests/makefile.msc, gtk/makefile.msc.in: Removed diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 87f1d51dfe..035031f1cd 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -2447,7 +2447,6 @@ clear_text_callback (GtkClipboard *clipboard, { label->select_info->selection_anchor = label->select_info->selection_end; - gtk_label_clear_layout (label); gtk_widget_queue_draw (GTK_WIDGET (label)); } } @@ -2470,6 +2469,10 @@ gtk_label_select_region_index (GtkLabel *label, { GtkClipboard *clipboard; + if (label->select_info->selection_anchor == anchor_index && + label->select_info->selection_end == end_index) + return; + label->select_info->selection_anchor = anchor_index; label->select_info->selection_end = end_index; @@ -2490,7 +2493,6 @@ gtk_label_select_region_index (GtkLabel *label, gtk_clipboard_clear (clipboard); } - gtk_label_clear_layout (label); gtk_widget_queue_draw (GTK_WIDGET (label)); g_object_freeze_notify (G_OBJECT (label)); -- 2.30.2